diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 4934771..93c1dba 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -244,7 +244,7 @@
  *  Close the DB connection if one exists
  * ------------------------------------------------------
  */
-if (class_exists('CI_DB'))
+if (class_exists('CI_DB') AND isset($CI->db))
 {
 	$CI->db->close();
 }
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 2d312e9..7bf1160 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -70,7 +70,7 @@
 	 * @param	mixed	the optional parameters
 	 * @return	void
 	 */	
-	function library($class, $params = FALSE)
+	function library($class, $params = NULL)
 	{		
 		if ($class == '')
 			return;
@@ -640,7 +640,7 @@
 	 * @param	mixed	any additional parameters
 	 * @return 	void
 	 */
-	function _ci_load_class($class, $params = FALSE)
+	function _ci_load_class($class, $params = NULL)
 	{	
 		// Prep the class name
 		$class = strtolower(str_replace(EXT, '', $class));
@@ -700,12 +700,12 @@
 	 * @param	string
 	 * @return	null
 	 */
-	function _ci_init_class($class, $prefix = '', $config = FALSE)
+	function _ci_init_class($class, $prefix = '', $config = NULL)
 	{	
 		// Is there an associated config file for this class?
-		if ($config !== FALSE)
+		if ($config !== NULL)
 		{
-			$config = FALSE;
+			$config = NULL;
 			if (file_exists(APPPATH.'config/'.$class.EXT))
 			{
 				include_once(APPPATH.'config/'.$class.EXT);